Enterprise Version
fixing